Merge "Cumulative patch from commit 4ec1fd8e42bad9390f14a58225b6e5f6fb691950"