Disk subscription

@ticoann fixes issue #5066, Is this going in the right direction ? please review and advise