Merge "Put the check for empty comment outside of the section anchor section of EditP...