Full review (do not merge)

Fixed in 1a1b476ac73f6.