Merging patch0004 changes