Merge of commit 8fa75e276f638b1156e0fa1c447fc49006112f88 form master.
Merge of commit ba93ad762db859d04d6aa2411e4587280ca06249 from master.
Merge of change 160dadad7af7dee209fa85ba8cbd9106fa60c799 form master.
Merge of change aa3445f1a5730c4cfabeb3cd200f00fdf6709381 form master.
Merge of commit 24cf3d0e2a57b88bb9550e4bccd8c8bb34c6d9db form master.