scheduling-object to non-scheduling-object test
Merge branch 'no-organizer-test' into 3.3