merge 2.4, allow to extend the manifest for pakackge compatibilty.