fix hr base
Merge branch 'dev' into siim