More master side changes for convergence with XFA.