Merge proposals dependent on lp://staging/~azzar1/unity/fix-687956-682787

lp://staging/~azzar1/unity/fix-687956-682787 has no merge proposals.