Merge "Revert "Cumulative patch from commit a9491695b30a7f750dc45cb563d813b03f1d4b8d""