merge of '0522ce6e18539b2787b0461c02f133fb7067acc9'