Post Code review changes.
#plat-537 #time 2h