Merge all internal changes