Merge "Parameter Check Correction" into tizen