Implemented last missing conflict solver
Merge branch 'rc/2.0.0' into develop