Merged 4.1 branch