Task 3.01 finished for COMPOR
Merge tag '3.02' into COMPOR
Task 3.02 finished for COMPOR