Merge branch 'pkg_mgmt' into v1.1