Merge branch 'master' into atram_rename