backport of dxr tools in to 73X stable