Merge branch 'feature-autconf-__res_query'