Move class_alias statements

Dieter Holvoetrequested to merge
issue/scheduler-3476369:3476369-argument-1-event into 2.x

Closes #3476369

Merge request reports