merge dev_5_0 -D org -I include -E exclude: PR 920 (Fix hard-coded link in documentation)
merge dev_5_0 -D org -I include -E exclude: PR 921 (Final BF doc updates for 5 release)