Merge pull request #11354 from neheb/abaskat1