merge of '01bddb578c9dd04edfbb56d0c1c15f81b4161479'