Eng 6590 inline limit for aggregate

I may change the API after merging this pull request and do that on the partial aggregate part, because partial aggregate use the same API and it will have conflicts if API changed now.