Merge 4.1 changes