Merge updates from Foundation 3 into Magellan.