Ok esmf back in
Merge branch 'putting_back_esmf' into devel