This bug is already blocked by the relevant bugs. It shouldn't be merged until they're resolved.