Merge latest code from tizen 2.4