Fix duplicate declaration of grm, update grb<*>

Fix duplicate declaration of grm, update grb<*> #3356