Merge pull request #3042 from srivasta/upstream-fixes