Merge pull request #34547 from shariquerik/crm-comments-overlap-fix