Commited changes from upstream