Merge "Visibility checks for checkPackage and watchingMode" into sc-dev