Merge branch 'hotfix/1.9.3'
Merge branch 'feature/concurrent_charts' into hotfix/1.9.4
Merge branch 'hotfix/1.9.4' into develop