Further changes to the core code merges.