CON-549: Addressed code review