merge of '63a6f6349530accb6a38bc556a6c380e3bf4d32c'