Merge "Fix logic inversion bug for "basicGrant"." into rvc-dev