Merge pull request #11342 from neheb/abaskat3ra3