Merge branch 'Issue-2394411' into 7.x-1.x
Issue #2393929 follow-up: fixing the tests
Merge branch 'Issue-2393929' into RC