XD-797 Code Review Change