More code updates
PLAT-688 #time 5m