merge of '35963985c4abdc1cadcdd1d173bfafdda771e76a'