Merge from 4.5-dev for trq-2561.