DAR-1405 Code review changes