merge of '4d50db658eb49ec921eb903f0d6f18de6e4b5dd8'