Merge pull request #15847 from neheb/assh