Merge branch 'master' into max-data-points