Merge branch 'eg26'