Merge latest codes from tizen 2.3 branch