Manage propagation engine in the reset operation
Merge branch 'feature-mres' into develop