diff --git a/Zend/tests/attributes/nodiscard/007.phpt b/Zend/tests/attributes/nodiscard/007.phpt
index 1b72de8c22a06..de4604e15e48d 100644
--- a/Zend/tests/attributes/nodiscard/007.phpt
+++ b/Zend/tests/attributes/nodiscard/007.phpt
@@ -12,6 +12,8 @@ zend_test_nodiscard();
 ?>
 --EXPECTF--
 <!-- internal enter NoDiscard::__construct() -->
+<!-- internal leave NoDiscard::__construct() -->
 
 Warning: The return value of function zend_test_nodiscard() should either be used or intentionally ignored by casting it as (void), custom message in %s on line %d
 <!-- internal enter zend_test_nodiscard() -->
+<!-- internal leave zend_test_nodiscard() -->
diff --git a/Zend/tests/lazy_objects/gh20905.phpt b/Zend/tests/lazy_objects/gh20905.phpt
new file mode 100644
index 0000000000000..318b44e6b82a7
--- /dev/null
+++ b/Zend/tests/lazy_objects/gh20905.phpt
@@ -0,0 +1,24 @@
+--TEST--
+GH-20905: Lazy proxy bailing __clone assertion
+--CREDITS--
+Viet Hoang Luu (@vi3tL0u1s)
+--FILE--
+<?php
+
+function test() {
+    function f() {}
+}
+
+class A {
+    public $_;
+    public function __clone() {
+        test();
+    }
+}
+
+test();
+clone (new ReflectionClass(A::class))->newLazyProxy(fn() => new A);
+
+?>
+--EXPECTF--
+Fatal error: Cannot redeclare function f() (previously declared in %s:%d) in %s on line %d
diff --git a/Zend/zend_lazy_objects.c b/Zend/zend_lazy_objects.c
index cf00804eda33b..a0cb1dfcdff19 100644
--- a/Zend/zend_lazy_objects.c
+++ b/Zend/zend_lazy_objects.c
@@ -744,12 +744,11 @@ zend_object *zend_lazy_object_clone(zend_object *old_obj)
 		}
 	}
 
-	OBJ_EXTRA_FLAGS(new_proxy) = OBJ_EXTRA_FLAGS(old_obj);
-
 	zend_lazy_object_info *new_info = emalloc(sizeof(*info));
 	*new_info = *info;
 	new_info->u.instance = zend_objects_clone_obj(info->u.instance);
 
+	OBJ_EXTRA_FLAGS(new_proxy) = OBJ_EXTRA_FLAGS(old_obj);
 	zend_lazy_object_set_info(new_proxy, new_info);
 
 	return new_proxy;
diff --git a/ext/zend_test/observer.c b/ext/zend_test/observer.c
index 31052ec830f73..348996b7ac132 100644
--- a/ext/zend_test/observer.c
+++ b/ext/zend_test/observer.c
@@ -288,21 +288,40 @@ static void (*zend_test_prev_execute_internal)(zend_execute_data *execute_data,
 static void zend_test_execute_internal(zend_execute_data *execute_data, zval *return_value) {
 	zend_function *fbc = execute_data->func;
 
+	ZEND_ASSERT(!ZEND_USER_CODE(fbc->type));
+
 	if (fbc->common.function_name) {
 		if (fbc->common.scope) {
 			php_printf("%*s<!-- internal enter %s::%s() -->\n", 2 * ZT_G(observer_nesting_depth), "", ZSTR_VAL(fbc->common.scope->name), ZSTR_VAL(fbc->common.function_name));
 		} else {
 			php_printf("%*s<!-- internal enter %s() -->\n", 2 * ZT_G(observer_nesting_depth), "", ZSTR_VAL(fbc->common.function_name));
 		}
-	} else if (ZEND_USER_CODE(fbc->type)) {
-		php_printf("%*s<!-- internal enter '%s' -->\n", 2 * ZT_G(observer_nesting_depth), "", ZSTR_VAL(fbc->op_array.filename));
 	}
 
+	ZT_G(observer_nesting_depth)++;
+
 	if (zend_test_prev_execute_internal) {
 		zend_test_prev_execute_internal(execute_data, return_value);
 	} else {
 		fbc->internal_function.handler(execute_data, return_value);
 	}
+
+	ZT_G(observer_nesting_depth)--;
+
+	if (fbc->common.function_name) {
+		if (EG(exception)) {
+			php_printf("%*s<!-- Exception: %s -->\n", 2 * ZT_G(observer_nesting_depth), "", ZSTR_VAL(EG(exception)->ce->name));
+		}
+
+		smart_str retval_info = {0};
+		get_retval_info(return_value, &retval_info);
+		if (fbc->common.scope) {
+			php_printf("%*s<!-- internal leave %s::%s()%s -->\n", 2 * ZT_G(observer_nesting_depth), "", ZSTR_VAL(fbc->common.scope->name), ZSTR_VAL(fbc->common.function_name), retval_info.s ? ZSTR_VAL(retval_info.s) : "");
+		} else {
+			php_printf("%*s<!-- internal leave %s()%s -->\n", 2 * ZT_G(observer_nesting_depth), "", ZSTR_VAL(fbc->common.function_name), retval_info.s ? ZSTR_VAL(retval_info.s) : "");
+		}
+		smart_str_free(&retval_info);
+	}
 }
 
 static ZEND_INI_MH(zend_test_observer_OnUpdateCommaList)
diff --git a/ext/zend_test/tests/execute_internal.phpt b/ext/zend_test/tests/execute_internal.phpt
index ce6cb851aed60..6c7fc75775919 100644
--- a/ext/zend_test/tests/execute_internal.phpt
+++ b/ext/zend_test/tests/execute_internal.phpt
@@ -4,6 +4,7 @@ Test zend_execute_internal being called
 zend_test
 --INI--
 zend_test.observer.execute_internal=1
+zend_test.observer.show_return_value=1
 --FILE--
 <?php
 
@@ -13,9 +14,24 @@ function f($a) {
 
 f(time() > 0 ? [1, 2, 3] : []);
 
+array_map("count", [[], [1, 2]]);
+
 ?>
---EXPECT--
+--EXPECTF--
 <!-- internal enter time() -->
+<!-- internal leave time():%d -->
 <!-- internal enter array_sum() -->
+<!-- internal leave array_sum():6 -->
 <!-- internal enter var_dump() -->
 int(6)
+<!-- internal leave var_dump():NULL -->
+<!-- internal enter array_map() -->
+  <!-- internal enter count() -->
+  <!-- internal leave count():0 -->
+  <!-- internal enter count() -->
+  <!-- internal leave count():2 -->
+<!-- internal leave array_map():
+  array (
+    0 => 0,
+    1 => 2,
+  ) -->
diff --git a/sapi/fuzzer/fuzzer-execute-common.h b/sapi/fuzzer/fuzzer-execute-common.h
index ef2ff4ee79bab..81b38df40da0e 100644
--- a/sapi/fuzzer/fuzzer-execute-common.h
+++ b/sapi/fuzzer/fuzzer-execute-common.h
@@ -134,6 +134,8 @@ ZEND_ATTRIBUTE_UNUSED static void create_file(void) {
 
 ZEND_ATTRIBUTE_UNUSED static void opcache_invalidate(void) {
 	steps_left = MAX_STEPS;
+	zend_object *exception = EG(exception);
+	EG(exception) = NULL;
 	zval retval, args[2];
 	zend_function *fn = zend_hash_str_find_ptr(CG(function_table), ZEND_STRL("opcache_invalidate"));
 	ZEND_ASSERT(fn != NULL);
@@ -144,4 +146,5 @@ ZEND_ATTRIBUTE_UNUSED static void opcache_invalidate(void) {
 	ZEND_ASSERT(Z_TYPE(retval) == IS_TRUE);
 	zval_ptr_dtor(&args[0]);
 	zval_ptr_dtor(&retval);
+	EG(exception) = exception;
 }