feat: make sure clear_value preserves local context order
#16500
| Job | Run time |
|---|---|
| 52s | |
| 52s |
clear_value preserves local context order
#16500
| Job | Run time |
|---|---|
| 52s | |
| 52s |