Merge branch 'master' into async
Added join
Merge remote-tracking branch 'origin/async' into chart
EOD commit