Code review from pierre for 4f9c32a9c0f2792986a3638e67b3cc531e22ce72