Merge pull request #13825 from mlutfy/dev801-5-12