merge of '5675a11f29ad06019a800afe9d5c0b13611dc46a'