Unity

Merge proposals dependent on lp://qastaging/~bitshifternz/unity/fix-for-bug-688117

  1. fix-for-bug-688117
  2. Dependent merge proposals

lp://qastaging/~bitshifternz/unity/fix-for-bug-688117 has no merge proposals.