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