[PLAT-3566]
Merge remote branch 'refs/remotes/origin/develop' into develop