Merge branch '12994-xmlmultiblockwriter-improvements-rel' into release
Merge branch 'Virtualize_Color_Methods-rel' into release

Change-Id: I77e1b3b31a1392fb2bb2031f1ec77cbf8234cc9e
Merge branch 'release'

Change-Id: Id16fefd9dc7d363aa785056f8aa6c462e162707b