[-] FO : Fix bug backport of #PSCFV-9021