Merge "prevent fix" into tizen_2.1