Merge with old branch

Change-Id: I3e9025f60badbc40cf0b9433483dcc095cf79e78