Comments only, relating to #8166 fix