VOLDEV-2: CR changes #2