Merge branch 'bugfix/mock' into 'develop'