INT-3295 Polishing

PR Comments.