Merge branch 'master' into uidev
hide stacked bar temporarily
Merge branch 'uidev'