Writing tests for 1.12
Merge tag '1.12' into final