Merge "Test for null package in isEnabledAndMatches()" into sc-dev