Merge branch 'master' into develop
Case 3820 - Added cache for bookmarks page.
Case 3820 - Added cache settings.
Merge branch 'case-3820' into develop

* case-3820:
  Case 3820 - Added cache settings.
  Case 3820 - Added cache for bookmarks page.
Merge branch 'develop'