[cyb-59] changes for PR comments