Merge "Decouple resources and preconditions in secgroup scenario"