- partial 2.8.2 update