PLAT-4506 - Push server error notifications to the client
Merge remote branch 'origin/develop' into develop