Merge changes 4/12

Change-Id: Id905e4ab37a99c65ac5b7be875154e8b9dbeb407