PLA-921 matcher edge case handling
Merge branch 'PLA-833' into dev