Added \ifentryinbib
Merged from dev