Merge branch 'feature/#7_dissolving-Mony' into develop