Merge pull request #9623 from micmac1/master-maria10226