Merge "Update UMO host attachment before state change" into main