GTG

Merge proposals dependent on lp://qastaging/~gtg-user/gtg/bugfix-516392

lp://qastaging/~gtg-user/gtg/bugfix-516392 has no merge proposals.