Commit fa4dfd5f authored Jul 03, 2024 by Kostis Trantzas

Merge branch 'cherry-pick-888ca64b' into '2024Q2_RC'

fix for #40

See merge request !31