Merge from upstream

Merge changes done from upstream.