Merge pull request #9578 from neheb/opn