Merge pull request #9988 from neheb/mot