Merge proposals dependent on lp://staging/~dorian-kemps/unifield-server/US-7025-7039

lp://staging/~dorian-kemps/unifield-server/US-7025-7039 has no merge proposals.