Merge "Log bpf rc file if it differs from the template files." into main