I did not take a look at this file at the moment. If we merge this in the develop, this file should not be merged.