Make comment match implementation
Merge commit 'da8b97b1c277edd96fa912599457bf7d20959e62' into HEAD