Small cleanup and improvements.
Merge remote-tracking branch 'refs/remotes/upstream/master'