changes requested in #6165 and #8519