merge of '971d18af52c7881e09c9f5ffa43d9bf33216ce83'