Head of devel before merging: 7be53608 Head of voicemngr_rdkb to merge: eaf0318e Manually fixed conflicts: libvoice/libvoice.h libvoice/voice-types.h line-dect.c line.c line.h ubus.c ubus.h Automatically merged: libvoice/common.c main.c
