Merge branch 'test-speedup' into 'develop'