Merged MDL-8566 from 1.9