Merge "Match more flags to get runnable packages" into sc-dev