Merge branch 'master' into script_devel to update INCLUSION model maker