PLA-1072 xapath query insted of regex to avoid template change issues
Merge branch 'PLA-1072' into dev