Full review (do not merge)

Fixed in e20c3609f817e5.