Merge pull request #8860 from rocxa/CRM-19200_Merging_prefix_suffix_only_fix