Merge "Catch new exceptions from BpfMap" into tm-dev