bug17770 - code review update