- partial 3.10 update