Update Thanks to master

Change-Id: Ib261a87317f4c45c981ff25a3a38a6bac2c0bd38