[gh] Merge in master (v1.12.2) and fix all tests