Merge finder mode into master