Merge branch 'bugfix/rel_me_missing_mocks' into 'develop'