DAR-307

Code review change