Merge "change package search path"