Merge "Fix forgetAllPackageInfos OutOfBoundsException" into sc-dev