Merge branch 'flx' into modular-prepare