* Add CAKE-435 BEP2 * Fixes (sanity and consistency, auto), history Co-authored-by: Iamdeadlyz <Iamdeadlyz@users.noreply.github.com>