Fixed issues for upstream merge.
Merge remote-tracking branch 'origin/master'