Fixed missing NFD on citekeys in .bcf
Merge branch 'dev' into ms