Merge change 6822

* changes:
  nexus: Rollup update for nexus