INT-2916 - Code Review Changes