Issue #10527: Remove dead code
Merge
Merge