merge of 'ba2394dc8bed77043b229f3e5c42b4b69aeca918'