Merge pull request #653 from ariard/2020-06-fix-outputs-tracking