Merge latest codes from tizen 2.4 branch