SUP-959 #comment Changes after code review