Merge remote-tracking branch 'refs/remotes/github/master'
SB fixes