backport cr:cap z wd