XD-2239 Code Review changes