Merged changes back to upstream.