Revert "Develop"
Merge pull request #1096 from openMF/revert-1095-develop

Revert "Develop"