Merge "Cumulative patch from commit 128f6a98b3d4d6ed103db759707309f451db9682"