Hopefully having fixed Trcavis
Merge branch 'hotfix/1.0.11'