merge of 'a1ae39784d60dda6b344012a273c0a4f2a339a97'