merge back from tizen_2.1_smack