Writing tests for 1.17
Writing tests for 1.18
Merge tag '1.17' into COMPOR
Task 1.17 finished for COMPOR
Merge tag '1.18' into COMPOR
Task 1.17 finished for COMPOR