Merge branch 'master' into paz-927