backport from cred