Merge hotfixes of main
into dev
#722
+39
−31
Merged
main
into dev
#722