1. Merge latest code from tizen 2.4

No match.