[WGID-447382] Resolve SVACE issue