[MAINT-2287] Handle refactor
[MAINT-2287] The rest of the updates so far to outbox.