Merge branch 'bug/JAL-2991_exporttosvgwrapview' into releases/Release_2_10_4_Branch