Creedence: backport fix for CA-90189