Sync to commit 24ba320: Merge pull request #488 from tpaviot/review/BOP-cut-improvements