case 2276 - New bookmark handling because of flag module update.
Merge branch 'case-2276' into develop