Merge "Use -o with grep to guarantee filename position"