merge of '7eb72993f7971af5ed6ca074f12728e72fab4af9'