Merge in original offline work.