Dialplan Features/Patch merge