merge of '953ae6dd8d43a51ab7e93b1157fbb67ba0c6b42b'