Merging changes from HomeBase