Merge "Update Gizmo and Spike image versions"