RFR - Ma edit review

Some unresolved merge conflicts in this file