BibField: improvements backported from next

Co-authored-by: Tibor Simko <tibor.simko@cern.ch>
Merge branch 'master' into next

* master:
  BibField: improvements backported from next