Tyring to put Vikram's work regarding Join Drive handler back in the
tree after mysterious disappearance (git at work)