Merge "Fix issue #20655182: API Review: ViewAssistStructure" into mnc-dev