feature: port some 23.1 code
3 files changed