The patch below passes block layout testing for me: