Show information only when editing bookmark
Merge remote-tracking branch 'upstream/master'