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