Merge "Handle grep finds no matches." into main