Full review (do not merge)

Comment removed in 75b106ee9ea.