Merge "Add Path trimming."