Merge branch 'master' into fast_show_hide