Merge branch 'bugfix/fvMeshAndSixDOFqODE'