merge of '405ed6c43e365446c1163c52c1a434ed0a270e85'