Writing tests for 1.16
Merge tag '1.16' into COMPOR
Task 1.16 finished for COMPOR