Merge "AssistStructure improvements"