DEV-20997 part 1
DEV-20997 part 2
Merge branch 'DEV-20997'