Merge branch 'newgen' into newgen-iliasg