DEV-23426
Revert "DEV-23426"

This reverts commit 575dec1fbafb51bd20aa7ef6e6e6e55093b75d5d.
DEV-22694 bug fix
Merge branch 'master' into releases