Merge from master
preload path check