Merge "Adding GIZMO chart to AAI"