Added more parts of the aggregate cells functionality patch.

Based on patch I079f767ad1c4e966c22d6722c0dfea6d5f35c54d

Change-Id: I4858af802787616567a8aa2a17a475eb6efbc381