chore: Update main
from v0.42
#2760
+16
−10
Merged
main
from v0.42
#2760