merge develop -D org -I include -E exclude: PR 533 (Removing BF anchor until it exists)
merge develop -D org -I include -E exclude: PR 557 (remind that model changes may affect IceMapper)
merge develop -D org -I include -E exclude: PR 561 (Adding ILdap as requested by Ola (rebased onto develop))