added max to xml
Merge branch 'feature-205' into release
Merge remote-tracking branch 'remotes/origin/feature-204' into release
fixed merge issues for three xml