chore: merge v0.15.3 release back to main
#2482
+30
−25
Merged
main
#2482