Merge more internal changes