Merge branch 'master' into img_tool