Merge pull request #2134 from atsign-foundation/xl/test