Full review (do not merge)

Fixed in 8c84d2c5a2cf043d38bed45d54d04e1.