Merge "Made Block::insert handle expired rows"