Update OPAL branch