Changes to master to more closely match XFA.