MIL-148 migration script
MIL-148 merge conflicts resolved