merge of 'bfb00d07f52c7b9131c72ba2ccf74615ff161cac'