am b1e52102: Cumulative patch from commit dc1a341dec54c28c3351ee7edab9ccaf7b68861f

* commit 'b1e52102c211357f585e9ff6d54501e90254326e':
  Cumulative patch from commit dc1a341dec54c28c3351ee7edab9ccaf7b68861f