Writing tests for 1.18
Merge tag '1.18' into 00
Task 1.18 not finished for OO