Merge branch tm-release

Change-Id: Idc75613ac3eb6cfc9ffb7cbc535028f4482db15c