Merge "ggrep" into klp-ub-dev