Power Platform Upload PAPortal and resetting option set attributes to default values

For multi-step forms, not all attributes are transferred between environments in following scenario:

1. Create Multistep Form with non default values for attribute: "Progress Indicator - Type" (default value = "Title") and "Progress Indicator - Position" (default value = "Top"),
2. Download configuration from portal from dev,
3. Upload configuration to qa,
4. Change "Progress Indicator - Type" and "Progress Indicator - Position" to default values,
5. Download configuration from portal from dev,
6. Upload configuration to qa,

We expect the values on qa to be reset to their default values (set in step 5), but they remain at the values set in step 1.
The reason for the problem is that the default values for optionset fields are not saved in yaml - comparison of files generated in step 2 and 5:

I believe the issue is also related to the issue - https://github.com/microsoft/powerplatform-build-tools/issues/254#issuecomment-1359390649 - in that case empty attributes are skipped when values are cleared.

Also similar to issue https://github.com/microsoft/powerplatform-build-tools/issues/254#issuecomment-1359390649 - the problem also applies to any object/record and any property/field with optionset type.. This requires manual handling when transferring configurations between environments and can sometimes be really hard to track down.