Full review (do not merge)

Fixed in 8c84d2c.