INFRA-593: Fix from QA review