sync with unstable pkg_content