Merge branch 'EH-2.0'