ACS facet parameter added both to builder and query
Merge branch 'release/facets'