Merge phy fixes for 5.17 into next branch to resolve the conflict between fixes and next for upcoming patches