Merge changes I31066a6f,I081cea0d into sc-dev

* changes:
  Fix broken test
  Updates to conversation page