Merge pull request #14506 from neheb/spm