Merge babeld configuration fix by zorun