Followup on review YGG-35
Merge remote-tracking branch 'origin/master' into XsltCreator