Fixed Svace Review WGID : 48078, 51539, 66983, 67170