Merge pull request #16379 from totten/master-coder-ivt