merge of '2b710e1818e35c1ae6f03e19452a17638f3b8048'