Merge changes Ic8799898,I450eebc4 into staging

* changes:
  Images added
  Images added