Merge "Remove separate OpIds for logging and enforce op ids instead - test change." into rvc-dev