Merge branch 'bugfix/mastofe-install-script' into 'develop'