Fix matcher parsing
See merge request !2501 (merged)
(cherry picked from commit 04ccf99b)
dc61bd6c Fix matcher parsing 1b1c7279 Fix a80b7adb Add test f665e00e Fix formatting 0c94ac3b Fix