Merge "Refactor image relocation"