INT-3351: PR comments
INT-3351 Final Polishing