Merge #13716

@terminalmage, please cross check this, I have to resolve a merge conflict