Merge branch 'development_flux' into development