Merge "Fix resolver for EL7 systems"