code review changes for commit 3ee3c4bdaf488ee9f757e8fce9e213dd5d056431