merge of '3eb18746718ae49add6982f56d77aef7a4f18d50'