Merge changes from topic 'mwd-merge-050415' into mnc-dev

* changes:
  Merge commit 'ab489de' into merge_try2
  Merge commit 'dd796e8' into merge_try2