Merge branch 'master' into script_devel to match with v0.10.10