backport/mark occurrence preference 1001466

Backport of #299 in release/3.0.x