diff --git a/main/pbx.c b/main/pbx.c
index b10ff51cb8..c24e30542a 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -7868,6 +7868,11 @@ static void context_merge(struct ast_context **extcontexts, struct ast_hashtab *
 			ast_hashtab_end_traversal(prio_iter);
 		}
 		ast_hashtab_end_traversal(exten_iter);
+	} else if (new) {
+		/* If the context existed but had no extensions, we still want to merge
+		 * the includes, switches and ignore patterns.
+		 */
+		context_merge_incls_swits_igps_other_registrars(new, context, registrar);
 	}
 
 	if (!insert_count && !new && (strcmp(context->registrar, registrar) != 0 ||
diff --git a/pbx/pbx_lua.c b/pbx/pbx_lua.c
index 33155f0a84..93d84736ee 100644
--- a/pbx/pbx_lua.c
+++ b/pbx/pbx_lua.c
@@ -1562,7 +1562,7 @@ static int load_module(void)
 	return AST_MODULE_LOAD_SUCCESS;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Lua PBX Switch",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Lua PBX Switch",
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,