branches update
GE-4: lang update
Merge branch 'GE-4'