SUP-959 #comment Code review change