Merge "Fix passing parameter after null" into tizen