Update optional from master.