Merge changes Ibb695b35,Ib4180502 into qt-dev

* changes:
  Skip the map update if not supported
  Check errors when iterate the stats maps