Merge remote-tracking branch 'maps/tizen'