First changes to get ready for merge conflict resolution. Altered files in accordance with orig repo meta.