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

* changes:
  Merge commit 'fd9760e' into merge_try2
  Merge commit '41ce566' into merge_try2
  Merge commit '21ec0f1' into merge_try2