Issue #2389609 follow-up: Fixing the test
Merge branch 'Issue-2389609' into 7.x-1.x