Update from development branch 2024_10_23 #47

Closed puyma closed 3 weeks ago