Merge branch 'ena-fixes'