PLUS-1038 and 991

https://catissueplus.atlassian.net/browse/PLUS-1038 and PLUS-991