Issue #2057 - apply kratib comments