change OR to BOR
Merge branch 'feature/algorithmtest' into develop