Merge "Add GD scanning init flags"