Merge branch 'flexus'