Urgent: XML Datasource 'sourceStep' and 'sourceStep' are not maintained

Hello,
I keep noticing that my XML Datasource sourcesStep is not preserved and I have to redo it and save the project. This obviously makes the test cases fail. I typically see this when trying to clone teststeps or testcases. These two actions for some reasons ends up wiping out the 'source step'.

Can you please look into this.

Thanks

Ali