merge XPagesExt for 90