merge of '91420cdee3e34c3b975471cb6fa4e446cd6c12a2'