Writing tests for 1.21
Merge tag '1.21' into OO
Task 1.21 NOT finished for OO