Addressing more CR fedback for #1294