Merging weekend changes.