Merge branch 'fixed_phy'