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