click once raises help, click twice will remove it
Operate on the container not the msg
Merge remote-tracking branch 'upstream/2.10.x' into 2.10.x