merge of '9d80f6499c5d862fca19d620f8124ac061dbe754'