merge of '9dc7779dad5b6a6762c08a60de1c3cba24575356'