Update Ti22 with master branch