Fixed issue with crash when cancelling tracking class
Merge branch 'hotfix/v2.1.2'