Will look into why upgrade fails. It worked in my tests. In the meantime, revert back to extras-version.