merge of '1dec36a8a477dcc0dd86c269177f241e965a4171'