cog

chore: pull over pre-release 0.17.0 improvements to main

#2762

Merged