#3462121: Use the standard entity handler pattern

Jonathan Shawrequested to merge
issue/registration-3462121:3462121-use-the-standard into 3.3.x

Related to #3462121

Merge request reports