bomb tests forever in branch
cherry-picking matcher changes for OC-6924
Tests fix
(cherry picked from commit 1b4e299)