Use TMxpElement as a value class to avoid memory leaks.
Merge branch 'release_31' into development

Use TMxpElement as a value class to avoid memory leaks.