Merge commit 'jblum/grc/tooltip'