Merge branch 'misc' into repack-v4