Merge branch 'fix-test' into 'develop'