cherry picking hmoore-r7 fix for load paths