adding match finder
Merge commit 'f1d72fb6e21eeeb41d4161e0c76771c4671be094' into features/cleanup_models