Merge "Cumulative patch from commit 3e949655c"