Merge "Cumulative patch from commit fcd85d9a3f2d9d63d0fa57e93446ad467db75b23"