bltxml tool test
Removed smartmatch and switch since it is deprecated in 5.18
Merge 5.18 changes from dev