[-] WS : Fix #PSCFV-9389, #PSCSX-2227, #PSCFV-10418, #PSCFV-9761