Merge changes from Tizen 2.4