Merge "Cumulative patch from commit c24f8e8e75b46f0b191cca788b6f4c10bed81861"