Merge "Test new AssistStructure improvements"