Merge branch 'add-missing-mock' into 'develop'