Stale BEF Merge

Requesting this get moved into master since there's not much to freeze / playtest. Also since BEF staging has gotten a little stale etc. heh