https://catissueplus.atlassian.net/browse/PLUS-1182