When tracker fails, return error code so that it fails the tests.
Merge branch 'master' into translationupdates