Merge "Added in change to ensure file name is passed through debug info"