[HYRAX-630]