Merge branch 'remove/quality_quantity' into develop