Roap branch compatibility