Merge "Cumulative patch from commit ed0a4ddc22526361a138c6b145561fcaac24e2a5"