Added sets for XML parser
auto-merge staging into master