Continuing merge from upstream