[GRMR-151] GRMR-151