(backport cxd4) ................