HRMS improvements

Private review report. Sign in to read it.