Final merge of offline branches.