FEM commit master
Merge branch 'master' into min-egen-branch