Update master to final