Merge branch 'newFeature_differentiation_fiends' into develop