Merge branch 'master' into Interface
Tweak radio button and add choice for auto or manual feedback
Tweak radio button and add choice for auto or manual search after doing feedbacks