align with public release

I don't even know Bonita! :)