Merge changes Ie0dd7a44,I5b3c0a48 into mnc-vt-dev

* changes:
  Merge commit 'e79fed5' into merge
  Merge commit 'abfdaea' into merge