3413: update for code review