DEV-20713 part 1
DEV-20713 part 2
Merge branch 'DEV-20713' into master