Merge "Handle Edget to Edge after sdk 35" into main