merge of '0b604857bbf871639fdb43ee8380222e8ef64bb7'