Writing tests for 1.24
Writing tests for 1.25
Merge tag '1.24' into COMPOR
Task 1.24 finished for COMPOR
Merge tag '1.25' into COMPOR
Task 1.25 finished for COMPOR