Code review updates
KMS-3488