Dialplan Features/Patch Backport

Backporting Dialplan Feature/Patch