merge of 198b28bba87e8c42ab6041406faa358334417c02