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 551 (Change var/logs/FSServer.log to var/log/FileServer.log)