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