Repackage and fixes towards 1.6 update