Merge branch 'net-phy-improve-and-simplify-state-machine'