Merge "Cumulative patch from commit 7bf86e44161fe1bcadaf4ca2cc3b6358fb7f3bf9"