Merge "Cumulative patch from commit 0ad3b9c402ee92863b720bc01f882ebcb1bd42c8"