Merge "Fix resource_setup order in scenarios"