Merge commit 'f28ffd0688d83c019e74a7d32759d5734396baa4' * commit 'f28ffd0688d83c019e74a7d32759d5734396baa4': set the selection after sending a click