Terraform Destroy issue with Role Assignment TF resources on locked Azure resources

I am running into this issue running Terraform destroy. I have a storage account that is deployed via different deployment (different TF workspace and different RG in Azure. This Storage account is locked for a good reason. I have another deployment that creates a role assignment for an MSI to this storage account . All this works fine except when doing a destroy it complains that it cannot delete the role assignment because the storage account is locked. Currently i have to remove the lock on the storage account, then run destroy and go and put the lock back. #1887 says it is fixed. Any thoughts are appreciated.