Full review (do not merge)

Fixed in b2a84734b178560e1ca7fb540.