- partial 31.0 update