enable multiple resolution of the same problem
Merge branch 'feature-mres' into develop