Resolve #3195459 "Custom classes"

Ana Colauttirequested to merge
issue/view_password-3195459:3195459-custom-classes into 6.0.x

Reroll Merge Request !6 to be able to merge to branch 6.0.x

Closes #3195459

Merge request reports