Merge branch 'reloc'