refs 6609 checked issue_number