merge of 'aeb1ac8ac964032ee256054d8009fd226a984570'