completing ticket https://catissueplus.atlassian.net/browse/OPSMN-1546