Merge "Add fold_grace_period_enabled flag" into main