bug17272_bibdk_mani_creators_break
Merge branch 'feature/bug17272_bibdk_mani_creators_break' into develop