Packages from the vendor efk3

efk3/grouping