Merge "Revert "Revert "Keep old package manager constructor""" into sc-dev