Merge "Abort migration early when not enough space." into oc-dev