Merge new tag with the current branch

Change-Id: Idefee712a7e580005b190cb63a156d2414fe9a51