[core][fr] merge bookmark feature