Merge branch 'master' into script_devel to rebase development branch