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

* changes:
  Merge commit '336b6a1' into merge_try2
  Merge commit '51d0dfa' into merge_try2