Merge tag 'moerkotte01' into develop

Moerkotte 01
blocking
Merge branch 'release/blocking_disk'