SUP-546 #comment code review changes