Merge branch 'phy_device_type'