Merge "Revise PackageVisibilityTest" into sc-dev