[GRMR-107] GRMR-107