Revert "Merge branch 'remove/mastofe' into 'develop'"