Merge branch 'cherry-pick-113bab7c' into '2024Q2_RC'

fixes to run tests in ide also. related to #41

See merge request !33