SUP-1142 #comment Code review enhancements