XD-1083 + XD-1092 Code Review Changes