Recent commits to cc have helped to address #83043 and #43468
To pull in this fix: 801a87bf2f
801a87bf2f