Merge pull request #18494 from nemesisdesign/master