merge of '3522489c0311d58fd9ccb9e295ecac8a0a18fc21'