Edit Flavour Haning on Updating Editor Metadata

Hello Expert,

We have created a flavour for IW21 and are encountering an issue when attempting to edit the flavour where the editor hangs up on the Updating Editor Metadata.

I notice a few other threads with the same issue:

https://scn.sap.com/thread/3920436

I am concerned with this work around due to dynamic flavour selection. If I am to create a new flavour it will change the ID number and I will have to update all scripts where the old number is used.

Is there no better fix to this issue?

Thanks,

Andrew