Merge branch 'capture-test-errors' into 'develop'