Merge
Merge pull request #1 from mjp90/dev/mp_split_architecture_old_version

Merge