Merge branch 'Issue-2389609' into 7.x-1.x
Issue #2389615: Ensure there's always a valid default option for the option set executor
Merge branch 'Issue-2389615' into 7.x-1.x
Issue #2389609 follow-up: Fixing the test
Merge branch 'Issue-2389609' into develop