Issue 20040: Refactoring