- Merge 1.12 changes into bleeding for further development.