merge of '16ddc63cc58ab4f6ac83a2e1d653c740ffdd6f87'