Merge branch 'bookmark-file-leak' into 'master'