merge of '266ecf7b63664e3503a2eec2b609cc4d504973a6'