Merge "Final update"