merge of '9c656e60411087235cb8e41b6b3ae676447fa38a'