changes for code review of 868227