XD-626 Code review changes