Merge branch 'hotfix/1.0.10'
Hopefully having fixed Trcavis
Merge branch 'hotfix/1.0.11' into develop