Fix reference data load with non-standard bundle binary path
Merge branch 'master' into develop