[-] BO : Fix warnings when importing #PSCFV-6648 again