Full review (do not merge)

Fixed in ecee920.