XD-1120 Code Review Changes