[HYRAX-599]