Full review (do not merge)

Fixed in 281a61b8952db1e0e0fd3aad12.