PLAT-3030 - Temporarily fix broken build
Merge remote-tracking branch 'origin/develop' into develop