XD-464 Changes per PR code review