Cross areas added
Merge remote-tracking branch 'origin/newgen-kit' into newgen-keznikl
refactoring and updating the area-related demo infrastructure + tests