Move some features from mainline code to pro pack module.