fix for ini_set + merge to branch01