nextgen changes

nextgen changes
more changes

more changes
Merge branch 'nextgen'
conflict

conflict