Merge pull request #4396 from radical/xbuild-deprec-fix