Update log from master.
Update optional from master.