merge fix_afterpackage