Merge branch 'rs/logical-vs-binary-or' into next