Merge branch 'finder-fixes' into stable