SUP 877 #comment code Review Chnages