Merge branch 'master' into chart_notice