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