merge of 'b84aeb3b3fcb9975cdaaafccc4ecbc7ca61c5312'