issue #21836: Most of workflow implementation