Merge change 7491

* changes:
  Update rollo with new interactivity model.