Writing tests for 1.18
Merge tag '1.18' into oo
Task 1.18 for oo