11.4.x update ordering

Alex Pottrequested to merge
issue/entity_usage-3607113:3607113-fix-5.x-branch into 5.x

Closes #3607113

Edited by Alex Pott

Merge request reports