Clc 2464 (QA) Fix grep

QA branch version of pull #1541