[*] Fo : Fix #PSCFI-7054 report followup #PSCFV-7463