VOLDEV-50: Code review changes