Revert "Revert "topic/PLAT-6783b""

This reverts commit 8ae71c365b9305e1c2dde537e1e7f12618370a7e.