code review comments

#commitcomment-7466161