Code review changes
SUP-1155 #time 30m