Re-rolled patches against 9.3.x as patch was not getting applied for MenuLink...