Merge from the 4.1-dev for TRQ-1786.