chore: bring in latest changes from next to v0.14-beta
#2589
+173
−79
next to v0.14-beta
#2589