Merge branch 'master' into issue/1097