WIP: 6.2 compatibility
[BUGFIX] Bug #53351 Call to a member function addValidator() on a non-object
TASK: Merge