Private bookmark support
Merge branch 'sammyshj-privatebookmarksupport'