merge: g-beret differences