Merge pull request #15155 from eileenmcnaughton/merge_perm