Merge changes from topic "fix-tapi"