#1563061 code review