Merge "Runtime can now be set to require relocation"