OK
Merge branch 'hr' into test
Fix merge