issue #22067: finish first draft of core for return