The release is blocked and we need to merge today — get this branch green and ready to merge, whatever it takes.
