Merge "Add required flag." into main