XD-1082 Code Review Changes