am 0e7d497c: Merge "Fix issue #22328792: Fix scalability issues in AssistStructure" into mnc-dev

* commit '0e7d497c10c4f5096cf4cd32a56784fd18ab0f2c':
  Fix issue #22328792: Fix scalability issues in AssistStructure