Merge "BpfHandler - remove use of getMap()" into main