Update optional, concept_check from develop.