Packages from the vendor fer

fer/apollo-cnf-merge