Merge "Update Gizmo and Champ security config"