merge of '08199c52a592fe71e2675200cf618a439d710884'