merge of 'aaafb999d11846eacd606047f3cddf7a583a9e0c'