XML 3.8.21 with fixes