Imported changes from 4.4