fix
Merge branch 'nir-4' into geka-work-3