merge develop -D org -I include -E exclude: PR 533 (Removing BF anchor until it exists)