Merge commit '4a1d8788dec5630b7a1874f661c6cbd1fc863328' * commit '4a1d8788dec5630b7a1874f661c6cbd1fc863328': [Issue 2097207] Adding filtering capability to aggregation suggestions
Merge commit '4a1d8788dec5630b7a1874f661c6cbd1fc863328' * commit '4a1d8788dec5630b7a1874f661c6cbd1fc863328': [Issue 2097207] Adding filtering capability to aggregation suggestions