2 more to master

Change-Id: Iefe49784a32240ae1fd370b8c99624e0aef51861