am b8235726: Merge commit \'7d40b063efb4755bfe23a328ad65671165a3ab29\' into HEAD

* commit 'b82357264cf74cbe813ca4d4036fd3eb0b3573d5':