merge of '79b90d4ef7df69035b001466908501f67f8aac76'