merge of 'ddb96d3b9aab2ad5b20313b9d5c42cda07ebb7f5'
and 'cad3d4a543081fe6d39167d8674b48bde1243fb6'