Merge branch 'hotfix/0.11.0.1' into wdtk