Merge proposals dependent on lp://qastaging/~mrasmus/unity/fix-713632

lp://qastaging/~mrasmus/unity/fix-713632 has no merge proposals.