Merged 'xml-processing-contribution' into 'config-setupflow-dev'

Signed-off-by: Alex Tugarev <telekom@tugarev.de>