Set fake URL for existing code to work properly
Merge branch 'nsdata-support' into together