Comments only: proposed solution for #8326