merge of '740568b10a465e2c82673155e6c544f4bf1fd4c3'