Merge branch 'master' into sigand-bugfix/3390