Drizzle

Merge proposals dependent on lp://qastaging/~shubhamsomani92/drizzle/trunk-bug-995739

  1. trunk-bug-995739
  2. Dependent merge proposals

lp://qastaging/~shubhamsomani92/drizzle/trunk-bug-995739 has no merge proposals.