[Glamtools] gerrit patches