Merge "Cumulative patch from commit 5bb7327a697108c880dd31c9e421df386c904b1a"