Internal/External Updates merged