Merge "Extend PASS and DROP opcode encoding to support incremental counter" into main