Merged fixes from reconciliation_compatible_imports