VOLDEV-27

@Grunny - here, I've cherry picked the two commits from #3482 so that we don't have that big mess. @TK-999 has already LGTM'd these changes, so could this be merged soon please? Thanks ♥