Merge branch 'master' into tracker-improvements