merge of '746afc454473a4b341411a3247c01c9b83c5606e'