[-] FO: Fix #PSCFV-10461