Writing tests for 1.17
Merge tag '1.17' into oo
Task 1.17 finished for oo