[pkg] fold in changes