merge of 'd64ac77a872f13513c87a0d8a234d5025cd4b8ab'