Merge with latest internal version