[BF] Do not create duplicate results
Merge branch 'master' into inex-live