closes https://moviplus.atlassian.net/browse/CGNIV-46 closes https://moviplus.atlassian.net/browse/CGNIV-47