https://worldnow.atlassian.net/browse/NMVP-5108