Fix 0013737
Merge branch 'master' into develop
Merge branch 'master' into develop
Fix 0014382
Fix 0014381
Fix 0014380
Increment Plugin-version
Merge branch 'release/3.0.5'