Resolve #3565777 "113 ci fixes"

dpirequested to merge
issue/entity_route_context-3565777:3565777-113-ci-fixes into 4.x

Closes #3565777

Merge request reports