(OSD BRANCH) Keep order in new ini structure consistent