Merge "Stop running CONF getattr during import"