[PATCH conductor 2/2] Redmine #3233: Consolidate duplicated steps