GTG

Merge proposals dependent on lp://qastaging/~parinporecha/gtg/hamster_plugin_minor_fixes

  1. hamster_plugin_minor_fixes
  2. Dependent merge proposals

lp://qastaging/~parinporecha/gtg/hamster_plugin_minor_fixes has no merge proposals.