merge of 0cac7f8ff05ffed52b7fd8c45edd92ac63c50786