Merge change 7928

* changes:
  This should depend on the new docs target, not the big one.