Merge pull request #10960 from pacoguzman/fix-build-due-to-10727

Fix build after #10727