CON-619 @hakubo `s Code review changes