side by side: manual match picker performance
Merge branch 'Adar'