Merge "Fix bad xml generation due to mismatched start/end tags" into klp-modular-dev