Full review (do not merge)

Should be fixed in 166412afb.