flux definitions
Merge branch 'flux' into dev