Merge OP current to MASTER