Merge "Fix an issue in iniset function"