--- main/pbx_timing.c	(Asterisk 16.8-cert10)
+++ main/pbx_timing.c	(working copy)
@@ -220 +220 @@ int ast_build_timing(struct ast_timing *
-		if (info[j] == ',') {
+		if (info[j] == '|' || info[j] == ',') {
--- main/pbx_include.c	(Asterisk 16.8-cert10)
+++ main/pbx_include.c	(working copy)
@@ -97 +97 @@ struct ast_include *include_alloc(const 
-	if ((c = strchr(p, ',')) ) {
+	if ( (c = strchr(p, '|')) || (c = strchr(p, ',')) ) {
--- utils/extconf.c	(Asterisk 16.8-cert10)
+++ utils/extconf.c	(working copy)
@@ -3826 +3826 @@ int ast_build_timing(struct ast_timing *
-		if (info[j] == ',') {
+		if (info[j] == '|' || info[j] == ',') {
@@ -4529 +4529 @@ static int ast_context_add_include2(stru
-	if ( (c = strchr(p, '|')) ) {
+	if ( (c = strchr(p, '|')) || (c = strchr(p, ',')) ) {