Full review (do not merge)

Fixed in 678f3720e6b5da00f.