merge of '30c320b2f51c86226580e5bbf68fa8b0896a0655'