Merge from 4.1-dev for trq-1560.