merge of '879c2e35f17da4b01ea93a7d8a286583b9eec1f6'