Don't convert findFunc generated $match to string and back
Merge remote-tracking branch 'origin/dev' into dev