Merge branch 'ds/repack-fixlets'