Merge branch 'KATTS-2153' into staging
merging staging to master with changes for KATTS-2153 and KATTS-2168
Merge branch 'master' into development