MD delay

Created originally on Bitbucket by Sticks (Simon Dibbern)

Was already merged in Bitbucket before import, marked as merged by the import user

As requested here: [removed]

Rest is already merged