[INI] First feature commit. This feature will work as an integration branch