Fix cloud regression on develop

The previous fix made on `2014.7` got squashed in a merge conflict when merging forward into `develop`. This PR contains the fix for `develop`.

Original PR #15443
Fixes #15436 on develop.