Merge pull request #10958 from pgavlin/VSO397793