Merge branch 'bpf-romap-known-scalars'