Merge branch 'ETH-regs-F4' into work