I picked a few patches from my feature branches which aren't relevant to those features to get them upstream. Patch 5 and 6 are v2 of a previous send regarding relocation policy improvements. cheers, Thomas