Recommit for issue-1747; comment fix