Merge branch 'fix-testing' into 'develop'