Added from 4.1 branch