Merge #10744: Use method name via __func__ macro