merge of '8dccbf106093aaa7b62b2a96962945185534c923'