refactor: inline
merge stable into default
merge default into bug25938