Don't try to set index path if it's null (ie not passed in) on startup
Add test file needed for overlay session testing
Merge remote-tracking branch: upstream/master