minor in bookmark api
Merge branch 'master' into cecilia
Merge branch 'cecilia' into ceci-dev