Merge Alan Branch