[PLAT-4846]
[PLAT-4842]
[PLAT-4881]
[PLAT-4882]