merge of 464cb51e4f1333becda8dfa1ccf4f9bbcea5514f