Merge branch '2025Q2_RC' into 'develop'

Merging "2025Q2_RC" to "develop" branch

See merge request !22