INFRA-823: tweak