Features/ini patch