[PLAT-5090] Restore lines lost during previous merge from branch