v1.12.2 minor performance improvements