Update Thanks to master

Change-Id: I52ad3cc4978b32364981fae9f83a4db69ac5af16