Merge branch 'fix-buggy-test' into 'develop'