GWTII-50: fix some merge artifacts (?)