Error in default settings for Find function
Merge branch 'Development'

Merge