[HYRAX-595]