Merge upstream changes for windows compatibility of branches

Delete ?test.py cause the name causes issues on windows OS and the contents were only for example data creation

assigned to @m.hock

merged

mentioned in commit ef4637cf