Fix failing system test.
Merge remote-tracking branch 'remotes/upstream/master' into cleanup