Fix for when no best match is found.
Merge branch 'origin/dev'