Merge "Enable WorkflowActionBB to skip last building block"