Partial merge from 2.3