Merge "Update B3 SVN to 13" into tm-dev