revert onDoubleClick to the version in commit aa575c1abe
modified merging of label changes