CLSN-683 code review - July 1st
19. dont fetch stkh & hier together