[WGID-11058] Fix the Svace issue