Merge branch 'refactor/preload-bookmarks-with-activities' into 'develop'