Merge branch 'enetc-fixes'