pick up workers life cycle management fix from master