Update/ofertie ncl

Merge branch 'feature/of-net' into ofertie-ncl