rolled back to 2.9.2 because 2.9.4 doesn't work with XML validator