Flip prevention

Merged Max Lyon requested to merge flip_prevention into master

Prevent normal flips and handle feature edges better

Merge request reports