VOLDEV-40: CR changes