tooltips for presence conditions
Merge remote-tracking branch 'upstream/master'