Merge branch tm-release

Change-Id: I0d1e9e6f0dbe73ca8416f7e4d7e70de630bef700