Merged 'patch2'