Code updates
PLAT-849 #time 15m