Merge "Permitted and search path change"