[CLEANUP] Add missing return value in click method
Merge origin/master